02638d626aa6fde2efeca1276989d0ab5fb57e0d,webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java,FileSystemImporter,addDDMStructures,#String#String#InputStream#,341

Before Change


			InputStream inputStream)
		throws Exception {

		String name = FileUtil.stripExtension(fileName);

		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.fetchStructure(
			groupId, PortalUtil.getClassNameId(JournalArticle.class),
			getKey(name));

		if (ddmStructure != null) {
			if (!developerModeEnabled) {
				if (_log.isInfoEnabled()) {
					_log.info(
						"DDM structure with name " + name + " and version " +
							version + " already exists");
				}

				return;
			}

			DDMStructureLocalServiceUtil.deleteDDMStructure(ddmStructure);
		}

		String xsd = StringUtil.read(inputStream);

		if (isJournalStructureXSD(xsd)) {
			xsd = JournalConverterUtil.getDDMXSD(xsd);
		}

		setServiceContext(fileName);

		ddmStructure = DDMStructureLocalServiceUtil.addStructure(
			userId, groupId, parentDDMStructureKey,
			PortalUtil.getClassNameId(JournalArticle.class), getKey(name),
			getMap(name), null, xsd,
			PropsUtil.get(PropsKeys.JOURNAL_ARTICLE_STORAGE_TYPE),
			DDMStructureConstants.TYPE_DEFAULT, serviceContext);

After Change


			InputStream inputStream)
		throws Exception {

		fileName = FileUtil.stripExtension(fileName);

		String name = getName(fileName);

		String structureKey = getKey(fileName);

		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.fetchStructure(
			groupId, PortalUtil.getClassNameId(JournalArticle.class),